Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Fri, 15 Jan 2010 17:01:04 +0000 (18:01 +0100)
committerJan D. <jan.h.d@swipnet.se>
Fri, 15 Jan 2010 17:01:04 +0000 (18:01 +0100)

Trivial merge